Merge branch 'master' of https://github.com/coinos/coinos-ui into notificationsnotifications

2 files changed, 7 insertions, 13 deletions

diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.js b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
index 90e6c0cc..94231376 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.js
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
@@ -1,23 +1,17 @@
 import { fail, redirect } from '@sveltejs/kit';
-import { btc as asset, auth, post } from '$lib/utils';
+import { fd, auth, post } from '$lib/utils';
 
 export async function load({ params }) {
 	return post('/parse', params);
 }
 
 export const actions = {
-	setAmount: async ({ cookies, request }) => {
-		return Object.fromEntries(await request.formData());
-	},
+	setAmount: async ({ cookies, request }) => fd(request),
 
 	send: async ({ cookies, request }) => {
 		try {
-			let body = Object.fromEntries(await request.formData());
-			let { amount, confirmed } = body;
-
-			if (!confirmed) {
-				return fail(400, { amount, confirm: true });
-			}
+			let body = await fd(request);
+			let { amount } = body;
 
 			await post('/payments', body, auth(cookies));
 		} catch (e) {
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
index 6ae699d2..af07a565 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.svelte
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
@@ -13,10 +13,11 @@
 	let { alias } = data;
 
 	let { currency } = data.user;
-	let amount = form?.amount || data.amount;
 	let a;
 	let maxfee = 100;
 
+	$: amount = form?.amount || data.amount;
+
 	let loading;
 	let submit = () => (loading = true);
 	$: update(form);
@@ -53,7 +54,6 @@
 		<form method="POST" use:enhance on:submit={submit} action="?/send" class="space-y-5">
 			<input name="payreq" value={payreq} type="hidden" />
 			<input name="amount" value={amount} type="hidden" />
-			<input name="confirmed" value={form?.confirm} type="hidden" />
 			<input name="pin" value={$pin} type="hidden" />
 			<input name="maxfee" value={maxfee} type="hidden" />
 
@@ -89,7 +89,7 @@
 			</div>
 		{/if}
 	{:else}
-		<form method="POST" action="?/setAmount" class="w-[300px] mx-auto">
+		<form method="POST" action="?/setAmount" class="w-[300px] mx-auto" use:enhance>
 			<input type="hidden" value={a} name="amount" />
 			<Numpad bind:amount={a} {currency} />
 			<button